feat: add move option to a modal window #2547
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Related FE PR |
GlugovGrGlib
force-pushed
the
g-glugovskiy/move_modal_window
branch
2 times, most recently
from
90f9205 to
6906f1e
Compare
GlugovGrGlib
force-pushed
the
g-glugovskiy/move_modal_window
branch
4 times, most recently
from
d2aeabd to
5ad8ca8
Compare
GlugovGrGlib
commented
May 2, 2024
cms/urls.py
Outdated
| @@ -146,8 +146,8 @@ | |||
| name='xblock_outline_handler'), | |||
| re_path(fr'^xblock/container/{settings.USAGE_KEY_PATTERN}$', contentstore_views.xblock_container_handler, | |||
| name='xblock_container_handler'), | |||
| re_path(fr'^xblock/{settings.USAGE_KEY_PATTERN}/editor$', edit_view_xblock, | |||
| name='xblock_editor_handler'), | |||
| re_path(fr'^xblock/{settings.USAGE_KEY_PATTERN}/actions/(?P<action_name>[^/]+)$$', xblock_actions_view, | |||
There was a problem hiding this comment.
Need to remove $
| }; | ||
|
|
||
| xblockView.render(); | ||
| require(['js/models/xblock_info', 'js/views/xblock', 'js/views/utils/xblock_utils', |
There was a problem hiding this comment.
Need to remove unused dependencies
| @@ -72,8 +73,10 @@ | |||
| CREATE_IF_NOT_FOUND = ["course_info"] | |||
|
|
|||
| # Useful constants for defining predicates | |||
| NEVER = lambda x: False | |||
| ALWAYS = lambda x: True | |||
| def NEVER(x): | |||
There was a problem hiding this comment.
Remove formating change
| @@ -208,6 +208,11 @@ function($, _, Backbone, gettext, BaseModal, ViewUtils, XBlockViewUtils, XBlockE | |||
| // Notify child views to stop listening events | |||
| Backbone.trigger('xblock:editorModalHidden'); | |||
|
|
|||
| window.parent.postMessage({ | |||
There was a problem hiding this comment.
Send message for edit
| @@ -185,6 +185,10 @@ function($, Backbone, _, gettext, BaseView, XBlockViewUtils, MoveXBlockUtils, Ht | |||
| targetParentLocator: this.targetParentXBlockInfo.id | |||
| } | |||
| ); | |||
| window.parent.postMessage({ | |||
There was a problem hiding this comment.
Send message for move
GlugovGrGlib
force-pushed
the
g-glugovskiy/move_modal_window
branch
from
5ad8ca8 to
b077870
Compare
GlugovGrGlib
commented
May 7, 2024
| @@ -119,6 +119,10 @@ define(['jquery', 'underscore', 'gettext', 'js/views/baseview'], | |||
| event.preventDefault(); | |||
| event.stopPropagation(); // Make sure parent modals don't see the click | |||
| } | |||
| window.parent.postMessage({ | |||
| method: 'close_edit_modal', | |||
There was a problem hiding this comment.
This message is incorrect, it should be generic for modals
GlugovGrGlib
commented
May 7, 2024
| @require_http_methods("GET") | ||
| @login_required | ||
| def edit_view_xblock(request, usage_key_string): | ||
| def xblock_actions_view(request, usage_key_string, action_name): | ||
| """ | ||
| The handler for rendered edit xblock view. |
There was a problem hiding this comment.
Please update Docstring to describe the rendering for different xblock actions
"""
Return rendered xblock action view.
The action name should be provided as an argument.
Valid options for action name are edit and move.
"""
GlugovGrGlib
commented
May 7, 2024
| @@ -208,6 +208,11 @@ function($, _, Backbone, gettext, BaseModal, ViewUtils, XBlockViewUtils, XBlockE | |||
| // Notify child views to stop listening events | |||
| Backbone.trigger('xblock:editorModalHidden'); | |||
|
|
|||
| window.parent.postMessage({ | |||
| method: 'close_edit_modal', | |||
| msg: 'Sends a message when the modal window is closed' | |||
There was a problem hiding this comment.
Please update message to specifically state about edit modal
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adding Move modal functionality